Merge "fix a crasher in surfaceflinger"