Merge "Allow user add/remove broadcasts to manifest receivers"