Merge "Create a separate feature flag to control permissions what permissions are device aware" into main