Merge "Fixes no vibration on old nav bar" into pi-dev am: 73f8361354
am: e913507a62

Change-Id: I2aef9c802870306f2bc72104e10bf9b53a82a187