Merge "Expose initial focus feature flag for testing" into oc-dev