Merge "Move aod icon vis handling to parent view-binder" into main