Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev