Merge "Merge "CE: Must dequeue a buffer if flipClientTarget requested" into rvc-dev am: 58dc474b3d am: 2c76e1b335 am: f058c9e28e" into rvc-qpr-dev-plus-aosp