Code review comment for lp:~mhr3/unity-lens-files/fix-841847

Ok great. I am happy then :-)

(test wise, this branch has similar status as https://code.launchpad.net/~mhr3/unity-lens-applications/fix-841847/+merge/90150. It is in some sense a refactoring - and it is very hard to test with our current tooling. I took extra care in review and test runs to remedy this)