Merge "Disentangle input manager service startup." into jb-mr1-dev