Merge "Removed calls to NPVC.getView()" into tm-qpr-dev