Merge "Removing some unnecessary layout calls in TaskView" into tm-dev