Merge changes I8b68efc1,Ic99ea27c into main

* changes:
  Move fix_line_height_for_locale to 24Q3.aconfig
  Move some exported flags into 24Q3.aconfig