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

Change-Id: Ide5e7c588eb1707015ac33a13fb9788e80617587