Merge "Remove focus task" into tm-qpr-dev