Merge "Fix setVrThread's exception handling." into nyc-mr1-dev