Merge "Tiny visual tweaks to QS" into oc-dr1-dev
am: 96decad236

Change-Id: Ida1b05a34017489078d22729830768a39053d970