Merge "Do not unregister lift when prox is covered" into qt-r1-dev