Merge "Replace InputManager.getInstance() with getSystemService() from context" into udc-dev