Merge "Appops refcount fixup" into main