Merge "SurfaceFlinger: Add SmoMo support" into r-keystone-qcom-dev