[3.8] Add simpler behavior for flash messages