Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev