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