Merge "Adjustments after moving MediaStore inside APEX."