Merge "Browser: add to support new folder/bookmark function"