Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev