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

Change-Id: If8d2963ed44e49e3b33b73a82378b2af32ba4676