Merge "surfaceflinger: fix fencing when composition mode switches"
am: 42ddbb44ac

Change-Id: Ie5255dcdadbd872670e07abfc6ece40cd543bb71