Merge "Respect feature flag when providing OHM controller"