Merge "Add null check for sync authorities of an account type" into lmp-dev