Merge "Changed to vibrate on down instead of up when entering pin" into nyc-mr1-dev