Yesterday
merge from background_flickering_fix