Merge "Move the mStrictModeCallbacks to be self-locked" into main