Merge "Disabling timer" into nyc-dev