Merge "Crash in Settings observed while changing the device orientation after renamed tablet"