Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev