Move session timer into android client