Merge "Fix namespace for the jank flags." into main