Merge "Refactor : Hide wayland operations from Window Manager"