Merge "SurfaceFlinger: tune LayerHistory to be less aggressive" into qt-r1-dev