Merge "Make add/edit bookmark be account-aware"