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

Change-Id: I83100ac5c1f4d896d96d2ff12d0ad59eba8b533b