Merge "Add MediaStore API to specify media capability uid" into sc-dev