Merge "Fixes incorrect app id cleanup on failure" into qt-dev