Merge "Use state loss version of fragment transactions" into main