Merge "Fix canadian french keyboard mappings" into main