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

Change-Id: Id157dba1141b394ac2689f3532ba7f6c07215eac