NXP-12814: Fix Drive edit crash under OS X
NXP-12815: Fix segmentation fault at Qt exit under Ubuntu