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

Change-Id: Ic4c127978c1d6d0f3e6ba03c211e9937f1ec8df6