am c87bb36a: am 372c9f90: Merge "improve EncodeVirtualDisplayWithCompositionTest to check rendered output" into klp-dev * commit 'c87bb36a': improve EncodeVirtualDisplayWithCompositionTest to check rendered output