Merge "Use currentKeyguardState for lockscreenVisibility." into main