Merge "Fix regression in unfreezing the recent task list" into tm-qpr-dev