Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2