Never use "will" in the clause where you use "while/when/before/after/by the time/as soon as/if/unless".
1. "Never" is a strong word!
2. Since 'if' and 'unless' do not introduce time clauses, we can't conclude that only time clauses are included in the "rule" - only that the "rule" applies...