Merge "OPP: Trigger media scan after transferred file"