Merge "Fix tests for keyguard_wm_state_refactor flag." into main