Merge pull request #9577 from lightsofapollo/notification-wake-lock

Bug 867652 - Hold CPU locks until notification is dispatched.
Conflicts:

	apps/calendar/js/controllers/alarm.js
	apps/calendar/test/unit/controllers/alarm_test.js