Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-dev