Merge "Reapply previous states when recreating the task bar" into tm-qpr-dev