Make add/edit bookmark be account-aware

Change-Id: I5e4e489d891adace7f76b4c4534a2203119dface
7 files changed