Merge "Flexible 2-app split: Motion and Overview" into main