Merge "Add EncodeVirtualDisplayTest" into klp-dev