Merge "Ensure that Screen Recording switches only respond to touch events within the target region" into main