Bug 936349 - Correct keyboard manager start-up +shepherd