Merge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev