Merge "Use DimmableIconPreference for Add user action" into mnc-dev