Merge "Fix ActionButtons alignment" into udc-dev