Merge "Scan system_ext while bootstrapping"