Merge "Update using tabs boolean immediately if it changes." into tm-dev