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

Change-Id: Ibd0600afc220f89bb38854f1032d3e6ade7f993f