Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair