Merge "Fix boot issues with keyguard_wm_state_refactor." into main