Merge "fix empty bookmark folder names bug"