Merge "Flexible 2-app split: Touch zones" into main