Merge "Fix memory leak in MediaScannerConnection"