Merge latest Settings.apk changed from Imran