Merge remote-tracking branch 'origin/master' into improveStorageBackend.
updated to be in sync with master.
Added code to prevent DB resource leaks in AlarmCreationActivity