Merge "Always give wifi a chance to quiet down during restore" into lmp-dev