Merge "Go to conversation list rather than pressing back." into jb-dev