Merge "AOD: Delay wakeup until interaction with notification"