Merge "Ensure the back gesture window is not touchable" into sc-dev