Revert "Revert "Halo : fix floating activity""

This reverts commit 534929227dc8699efcf8717cb82cc6bad6e1ea64.