Merge "Improve thread safety of input mappers." into gingerbread