Merge "Rotate keyguard indication messages" into sc-dev