Merge "Add Z scaling during unfold to launcher"