Merge "surfaceflinger: repaint on DOZE_SUSPEND exit"