Merge "Ensure widgets header is out of the gesture region before clicking" into sc-dev