Merge "Add null check for vrManager"