Merge "Support scrolling in add bookmark dialog"