Merge "Quick fix for FAB fade setting summary" into main