Merge "[QS] Fix alarm text in QS header" into pi-dev