Merge "Change the Settings to app name with settings"