Merge "Make some Keyguard changes to accomodate screenshot testing" into main