Merge "Ensure we wait for one round of Fastboot listener update"