Merge "Remove non-shell transitions code from SplitSelectStatController" into main