Merge "Lazily get UserManager to avoid NPE" into main