Merge "Remove FLAG_SPLIT_TOUCH from launcher code" into main