Merge "Clean up ShadowUserManager"