Merge "Add alarm info to QS Panel"