Merge "Skip scanning non-changed audio/mp4 files." into mainline-prod