Merge "Prevent double selection of second split app" into tm-dev