automerge: 65c08ec * commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236': Handle policy change while keyguard disabled