HALO: Code cleaning up

Credits to: Anu6is

Change-Id: I10c3db6a538ba475f567e3e00fe6f92e00364bbc
Revert "Fix 'lag' for older devices"

This reverts commit 8a45ce651fafa82c1f9f7f9552229e764fbc612f.
Merge remote-tracking branch 'upstream/jb3' into jb3