Merge "Fix calculateSystemGestureExclusion"