Merge "TIF: Generate hardware input id in language-neutral fashion" into mnc-dev