Merge "Properly apply launch animation params" into tm-dev