Merge "Add null check for vrManager" into pi-dev