Merge "Apply transaction when starting back nav" into tm-dev