Merge "Remove AoD icons from burn in layer" into main