Merge "improve EncodeVirtualDisplayWithCompositionTest to check rendered output" into klp-dev