Merge "Fix custom buttons with translated string" into udc-qpr-dev