Merge "Implement base functionality for flexible 2-app split" into main