Merge "[flexiglass] Adds pointerCount and fromEdge to the UserAction model." into main