Merge commit '77d9a5a55fa52074f18012cf997854a82500fd59' * commit '77d9a5a55fa52074f18012cf997854a82500fd59': Fix race reading input configuration during system startup.
Merge commit '77d9a5a55fa52074f18012cf997854a82500fd59' * commit '77d9a5a55fa52074f18012cf997854a82500fd59': Fix race reading input configuration during system startup.