Merge "Settings: only replace content with new fragment if it has no saved instance state." into ub-launcher3-dorval-polish
am: c3f7664475

Change-Id: Ie802edcfc44df01fd8bfbf36fbfb913544285bb0