Merge "Fix UI for resource component buttons" into studio-1.4-dev