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

Change-Id: If206c986e5bbb1aa53ecf9e5dabcc481b066cd93