Merge "Fix issue with wrong user task being resolved" into qt-dev am: 84ac023b8a
am: eb84644abd

Change-Id: I53281a59941aff3849859be30e5ec438b7e0c881