Merge "Correcting typo in doc of MEDIA_XXX intents"