Merge "Temporary fix for QXDM crashes." into nyc-dev