Merge "Remove category key SYSTEM_INPUT"