Merge "Reduce number of TIME_TICK broadcasts"