Merge "Respect the locale in vertical location of AM/PM"