Merge "Additional test fixes for keyguard_wm_state_refactor." into main