Merge "Update edit mode background color to match spec" into main