Merge "Bring width of controls panel up to spec" into tm-qpr-dev