Merge "Fix up the QS gutter" into oc-dev am: 78ee090f78
am: f4968f3c98

Change-Id: I9b7d99aa2b519c8c9629dbec32d22c906f0456f7