Merge "Updates to the add bookmark dialog."