Merge "Do not reset security message when pattern resumes" into pi-dev