Merge "Fix 5389072: NPE in MediaController.updateFloatingWindowLayout()."