Merge "Merge "QS: Don\'t cause click noise when opening from QQS" into nyc-dev am: 8a1561a772 am: 9458057c9b" into nyc-mr1-dev-plus-aosp