Merge "Don't crash when component enable/disable broadcasts race with uninstall" into klp-dev