Merge "Lock when obtaining the current monitor name." into jb-mr2-dev