Merge "Hide dev options v1 under feature flag"