Merge "[ShellTransit] Reset alpha in buildFinishTransaction" into tm-qpr-dev