Merge "Expose initial focus feature flag for testing" into oc-dev
am: 7ac3fb2282

Change-Id: I615222fa4f1ee33c977daf771a15495e7771d2ca