Merge "Move FragmentState out of Fragments.java [framework edition]"