Merge "QS: Add content description to page indicator" into nyc-dev