Merge "surfaceflinger: discard stale commands" into oc-dev