Merge "Fix RemoteException handling in MediaController" into main