Merge "Add an option to allow a (subtle) notification vibration during calls." into cm-10.1

Change-Id: Icdbc7e85c8b8db81fd38de3d4730e918447abb2a