Merge "Remove block notice tracking"