Merge "Wait for initial device scan to finish before updating config." into gingerbread