Merge "Fix the weirdly broken code in NotificationWakeUpCoordinator" into tm-qpr-dev