Bug 1007598 - We should never try to format the phone number on a removed call.
Or we'll trigger an infinite reflow loop.
Merge pull request #23373 from etiennesegonzac/bug-1007598-1.4

Bug 1007598 - We should never try to format the phone number on a removed call r=gsvelto a=bbajaj
Bug 1058555 - Updating preloaded apps in FOTA/OTA results in duplicate apps in /data/local/webapps r=gduan
Merge pull request #23353 from yurenju/uuid-v1.4

Bug 1058555 - Updating preloaded apps in FOTA/OTA results in duplicate apps in /data/local/webapps r=gduan