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

Change-Id: I0444901a32973003a9ceed4c5afd153affe17d56