Merge "Call updateKidsModeSettings without holding mLock" into main