Merge "media: add more feature flags" into main