Merge "Show freeform button only when dev option is on" into main