Merge "AOD font sizes"