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

Change-Id: I1414b9899336f34aac86116cf4d39fd68f2b0fdd