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

Change-Id: I3ffbf8ba6f224cdb8c4d6d5a36ad40a1860dfad4