am 47d2753a: am 98b14c46: am 06bdf9c6: Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev

* commit '47d2753a3b629011e31f43f953290ecd0a6b8c6a':
  Always show auxiliary subtypes from NavBar keyboard icon.