Merge "Migrate MediaController to use OnBackInvokedDispatcher" into tm-dev