Merge "Remove KeyEvent logic from CentralSurfaces" into udc-qpr-dev