Merge "Fingerprint vibrate doesn't change based on DND" into pi-dev