Settings.apk improvements