Merge "Fix the notification vibration setting and add a test app that lets you...

Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread