Lock when obtaining the current monitor name.

Also, remove some dead code.

Change-Id: I0e65671f9ca43addd8fc44dcd878bcff2f588e42
1 file changed