More Settings.apk improvements :)