Merge "[Settings] Fix UI layout" into main