Merge pull request #12389 from lioncash/cheeve AchievementManager: Make GetInstance() and GetLock() return a reference