* commit 'da58f39374a716dedc7c4050755b711a9a6bfcf5': Fix NPE when public API removeProximityAlert() used before addProximityAlert().
* commit 'da58f39374a716dedc7c4050755b711a9a6bfcf5': Fix NPE when public API removeProximityAlert() used before addProximityAlert().