Nuke the 'vibrate during call' option.

It has never worked anyway, as NotificationManagerService prevented the
vibration on a lower level.

Change-Id: I5192d841796d3a2e1a447140eb26096b09aaec2d
JIRA:CYAN-1550
Templates: back button goes to preferences not conversation list

Change-Id: Ib12e521b5049b0139ad638edb3a1583c3410cac5
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1