Merge "Revert "Remove vr_wm service"" into oc-dev