Merge "Update the QS page indicator" into nyc-dev