Solve issue #151: Review use of TimerTask and replace it with Handler where needed