Merge "xci: Make post merge job common across all scenarios"