Move routing logic to all activities (and other upstream commits)

Created by: pR0Ps

Looking at the TextSecure issue tracker, there seem to be a few issues with this commit (which isn't surprising given it's size and scope).

We'll keep it in a branch for a while until they get resolved.