Merge "Match Compat Media Button parsing with latest framework" into lmp-mr1-ub-dev