Merge "destroyHardwareResources in onStop()" into nyc-dev