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

Change-Id: I755b0f38c907d1ae7bf12df67f4b10590a9016bf