Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev