Merge "Use client-side version of inTouchMode" into pi-dev