Merge changes from topic 'monitor_lock'

* changes:
  Prevent holding stale Thread pointers
  Add more info to monitor contention logging