Merge "Add occlude/unocclude support in keyguard shell transitions" into sc-v2-dev