Fix interaction of on demand with notifications/keyboard