NXP-11799: More fixes for the switch to PyQT
NXP-11799: Format