Merge "QS: Fix QuickQS visibility at non-first page" am: fce04dc0be am: 56812a0146 am: 852fb2b1f1
am: 29d656dbe1

Change-Id: Ibfa95306964670aa10618bc5aa377a0a1bb6ab06