Merge "Remove duplicate MediaStore class" into rvc-dev