Merge "Introduce updateVisibility and updateLayout" into tm-dev