Merge "Fix bug 5116342 - don't keep fragment state around once resumed"