Merge "surfaceflinger: fix current transform hint"