Merge "onResume -> onStart, onPause -> onStop" into nyc-dev