Merge changes I87a37ebe,Ibd8528a3 into main

* changes:
  Add feature flag for Security Log for Zero Trust feature
  Add feature flag for Dedicated Device Control feature