Revert "Temp fix for halo"

This reverts commit 5f31e79cdb1355d43b261f866760e3e878ab0d94.
Revert "FW: Halo: Remove expanded desktop dependency to longpress action"

This reverts commit 0ca82480006ff53c2fb0ddf541424cbf4c90131b.
Remove Halo... may she rest in peace. Perhaps someday soon...

Change-Id: Ie3ad4fc9cb244defe5ba5bb7c98ad156df607a9d
Merge remote-tracking branch 'th/jb-mr2' into jb-mr2