Merge "Fix GONE->AOD->GONE with timeout" into main