Merge changes I0b1cb7ac,I1a5eb572 into sc-dev

* changes:
  SurfaceFlinger: Check both queues in transactionFlushNeeded
  BufferStateLayer: shouldPresentNow is always true