Merge "Replace custom header spy window with custom touchable regions" into main