Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev