Merge "Make mLock static for accessibility" into main