Merge "Preference SimSettingsActivity not aligned correctly"