Merge "Adjust preference order to correct the position of Accounts" into sc-dev