[fixed] sampling while riding a pet will automatically cause dismount

Change-Id: Iaeec5f14742e658077891c20a7921aa523c16847
Merge "[fixed] sampling while riding a pet will automatically cause dismount" into unstable