Merge "Fix NPE when public API removeProximityAlert() used before addProximityAlert()." into jb-dev