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

Change-Id: Iaf55f4ea10cadd02b8363fdb3ddf0d9543971f86