Merge "Don't use a scrollable dialog for CastDialog" into tm-dev