Merge "Log system keys and shortcuts" into udc-qpr-dev