Merge "QS Header: remove collapsed alarm ripple" into nyc-dev