Merge "Fix AOD2 notifications not waking up the device if the screen off animation played." into sc-dev