Gestures n UMS fixed

Change-Id: I0cb30b6643822717d18e0a233a46a4368e51173a