Removed multiple timers for iOS
Merge remote-tracking branch 'origin/beta2' into beta2