Merge "Fixing ControlsRequestDialogTest"