Merge "Add shell-transitions inTransition check to getTouchOcclusionMode" into sc-v2-dev