Merge "Fix LockTaskModeTests failure" into tm-qpr-dev