Fixed issue with findViewByID NPEs and issue with alarm screen still
visible if alarm killed elsewhere