Merge "Correctly save retained fragments in the backstack" into oc-dev