Merge "Do not try to unregister APC multiple time" into qt-dev