Attempt to fix the android timer bug.
Merged with the current Master