[git pull] fbcon locking fixes.