GitLab

When we made the bookmark permissions public, we also changed their
names, which might break existing apps.  Change them back.  Depends
on a change in frameworks/base.