Merge "Revert "Add CUJ constants for launching and saving App Pairs"" into main