Merge "wmshell: make CompatUIController injection Optional<>" into main