Merge "xci: Set installer type for the tested scenario"