Merge "Delay showing the controls ui after dialog" into tm-qpr-dev