Templates: back button goes to preferences not conversation list

Change-Id: Ib12e521b5049b0139ad638edb3a1583c3410cac5
merge changes from remotes/github/cm-10.1 into master