Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom