Changing to P2 since this is not really blocking the onboarding feature, and it's a bit unsure if we want to do this / can get it done before targeted launch, due to bookmark sync team's comment:

according to mamir@:
"
It's not hard to change and I think we can also avoid introducing any extra data communication with the server while bringing local nodes to the front.

Currently there is an old legacy implementation, and we are working on a new architecture.
Should we change both? I would be less confident when touching the old legacy code.
If not, then the two implementations would diverge and we should maintain two different set of test cases for each implementation."