am a7f8ceb5: am 1197838f: am c87bb36a: am 372c9f90: Merge "improve EncodeVirtualDisplayWithCompositionTest to check rendered output" into klp-dev

* commit 'a7f8ceb553725148eb4e6da48905f429e141261a':
  improve EncodeVirtualDisplayWithCompositionTest to check rendered output