Merge "Fix rounded borders of save/edit to match spec" into sc-dev