Merge "[TouchLatency] Update style to accomodate for the edge to edge" into main