Merge "Fix clipboard dismiss button text color in dark mode" into tm-dev