Merge "Fix 5521540: UI Tweaks." into ics-mr1