Merge "Fixed a regression where one couldn't go to the keyguard anymore" into sc-v2-dev