Merge "Surface: do not evict outstanding buffer in onBuffersDiscarded" into rvc-d1-dev