Merge "Address review comments for fade manager configuration API" into main