Merge "Fix component management in VrManagerService." into nyc-mr1-dev