Merge "Fix memory leak in MediaScannerConnection" into nyc-mr1-dev