Merge "Remove InputManager and DisplayManager from ViewRootImpl" into udc-dev