halo, wrong touch calculation, nap trigger fixed

Change-Id: Ib09163d71cddb2cbe8f375313e0c1e03b37fd504