Merge "Fix MediaStyle API comments" into lmp-mr1-dev