Merge "surfaceflinger: fix fencing when composition mode switches"