Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0