Merge "Allow fragment state loss on fragment transaction"