Merge "Add descriptions to MediaController buttons" into lmp-dev