Merge pull request #1718 from lioncash/wxdoesitagain ControllerConfigDiag: Potentially fix scaling problems on high DPI