Merge "Fix text direction based on locale in CDM dialog" into main