Merge "Keyguard error color" into sc-dev