Merge "Fix recent task screenshot may not cleanup in some cases" into qt-dev