Merge "Track creation of a11y overlays using an AppOp" into main