Merge "[Settings] Code refactor - reuseable layout extration"