Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev