Merge "MediaRouter: Add missing content description for album art" into nyc-dev