Merge "surfaceflinger: work around dumpsys lockup"