Merge "Fix privacy indicators leak (i.e., active op leak)" into udc-mainline-prod