Merge "Revert "Change to latest wayland inputmethod protocol"" into devel/master