Merge "surfaceflinger: flush HWC commands when present is skipped"