Merge "Add vibrate on down over nav bar and tick on motion up" into pi-dev am: 25092e1d93
am: d26dca20a7

Change-Id: Ic9bba760d2c4c23da08116e98afa74fa216e1e76