Merge "When ringer changes to vibrate, phone vibrates" into pi-dev