Merge "Handle keyguard occlude/unocclude in shell transitions"