Merge "Improve Cast dialog styles" into tm-dev