Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev