am bfdec890: am 75e181dd: Merge "Lock when obtaining the current monitor name." into jb-mr2-dev

* commit 'bfdec8908525c749f379b310f1c4d4c13d6321d7':
  Lock when obtaining the current monitor name.