Merge "Postponing package rescan to prevent blocking device startup" into sc-dev