Merge "Fixing NPE in Group Selector UI"