Merge "Merged vr window manager and vr composer"