Merge "Add a flag to fix the cache for UserManager.getUserProperties" into main