Merge "Use TextView for dialog title" into sc-v2-dev