Merge "Fix bug #12898564 Settings Crash on Renaming the device."