Merge "Fix new Physical UX feature flagging" into main