Merge "Fix user switching dialog colors for television."