Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1