Merge "QS: Don't cause click noise when opening from QQS" into nyc-dev