Merge "Add flag for captionBar force-consumption in freeform" into main