Merge "Revert "Revert "Add null check for vrManager"""