Merge "Use the proper transaction when finishing a split screen transition" into tm-qpr-dev