Merge "Prevent orphaned fragment on the settings stack." into ics-mr1