Merge "MediaRouter: Fix RuntimeException in the chooser dialog" into nyc-support-24.1-dev