Merge "Moved FaceLock bind/unbind calls inside of null check"