Merge "Fix layout issues in suw all set page" into udc-dev