Merge "Re-scan all directories only after OTAs."