Merge "Preserve account list in order of creation in the database." into jb-dev