Merge "Let activity of "add language" fit settingsactivity style." into sc-v2-dev