Guard multi-key gesture refactoring more strictly

Initially we guarded the multi-key refactoring by only having
multi-key rules flag guarded, which had a minor side-effect.

Test: manual
Bug: 377441045
Flag: EXEMPT bugfix
Change-Id: I04e6e1b16af2cc44c397e31388591b287c520d2a