Merge "Fingerprint enrollment vibrate unchanged by dnd" into pi-dev