Merge "Add broadcast when notification block state changes"