Merge "Do not remove User Manager and AppOps from Java cache" into main