am f2cac4d4: Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev

* commit 'f2cac4d495a6365758a99f4eba531579ab73fee5':
  Retry "Always show auxiliary subtypes from NavBar keyboard icon."