Merge "RESTRICT AUTOMERGE Use Alternative Prox Sensor for Falsing" into qt-qpr1-dev am: 8161bd3ab6

Change-Id: I7c90e2fb6c8a35b085984030eaf52d3d2ac72299