Merge "Rename onResolveStopped to onResolutionStopped"