Some cm differences and only observe if gestures enabled

Change-Id: I0bca1495d1d608d21d911f90a6bc8761825cbf34