Merge "Remove notification content from icon a11y" into main