Merge "Not log error when isPackageEnabled = false" into main