Merge "Avoid binding to providers if no apps are scanning" into main