Merge "Keyguard - Update emergency button" into sc-dev