Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev