Merge "Fix background inconsistency of the Settings page in SUW" into sc-dev