Merge "Use custom action key icon" into udc-qpr-dev