Merge "Update recent tasks order when the last resumed activity changed" into tm-qpr-dev