Merge "Revert "Revert "Fix lifecycle issue in CommonPool""" into qt-dev