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

Change-Id: Iacf47b544c4e0c71a3d75dadd885e62420a533f9