AlarmManager - fixed
TODO UnblockActivity
Merge remote-tracking branch 'origin/dev' into dev