Merge "Use explicit intent for MediaScannerConnection" into klp-dev