Merge "Wait for screen on callback to send aodInterrupt" into sc-dev