chore: consolidate ManageSettingsLayout
code
#14885
Merged
ManageSettingsLayout
code
#14885