Merge "Don't let Keyguard play un/occlude when not visible" into main