Merge "sf: Fix issue with dequeueBuffer when multiple display present"