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