Merge "Correct state loss tracking for FragmentTransaction.commitNow" into nyc-dev