Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" into rvc-dev