Taking the last interface will always result in preferring the non QT timer interface which results in walletpassphase re-locking correctly over RPC and over the GUI console.
Should fix #7316 for 0.12.
Clean fix for master is in #7317.
utACK
utACK daa8da2
Tested ACK 9490ec3 (which should be similar to daa8da2), indeed fixes #7316 (comment).
utACK
In the future, please put these kind of details in the commit message itself. :/
Right, if you are doing the rebase anyway, additional info like in a74fa1f06b3c3f75afd9f54d85d1243c7df279a9 is helpful. If a rebase is not necessary, a new pull should be created anyway, so the commit ends up in the release note logs.
Milestone
0.12.0