Merge "Hide cross-user getInstance() and promote non-cross-user getInstance()" into main