Merge "Rearrange Settings dependencies" into main