[fixed] Entering the geo caves will properly reset the Geo Tenloss
conversation

Change-Id: I1d5e7ddf217b64d970ff3b01d78542b824cb800c
Merge "[fixed] Entering the geo caves will properly reset the Geo Tenloss conversation" into unstable