Merge "Add release haptic to nav bar buttons" into oc-dr1-dev
am: 43a0236891

Change-Id: I806d35f8a3a1f9f77b88a170add6eeaf52efb95b