Merge "Style tweaks for resolver empty state." into tm-dev