Merge "Empty state UI tweaks" into tm-dev