Merge "Add feature flag for deprecating permission tree related APIs" into main