Keep common-settings alphabetical in order after the rename.
Hide Find My Device from the Settings menu.