Merge "Fix race reading input configuration during system startup." into gingerbread