Merge commit 'origin/locationlistview' into friendlist_filtering_text_field