Merge "Remove FSI_FORCE_DEMOTE and SHOW_STICKY_HUN_FOR_DENIED_FSI" into main