Merge "Fix overlapping sensor icon and ignore logo a11y" into main