Merge "[QUANTUM] Update folder_item for widget selection" into ub-gmail-ur14-dev