Merge "Fixes to allow enabling of enable_refactor_task_thumbnail flag" into main