Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev