Merge "SurfaceFlinger: tune LayerHistory to be less aggressive" into qt-r1-dev am: e35878cea2
am: 9e35550692

Change-Id: I16909b588361747a012b42c847cf756fea6acb7e