Merge "TIF: Specify the default implementation of onTune(Uri, Bundle)" into nyc-dev