Merge "Do not register lift when sensor is not present"