Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev