Merge "Merge "Fix issue with wrong user task being resolved" into qt-dev am: 84ac023b am: 98740150" into qt-r1-dev-plus-aosp