Merge "Fix color contrast in All Apps text by setting the color to onSurfaceVariant" into main