Merge "Remove redundant scan on boot completion."