Fixes for the custom longpress revert

Change-Id: If85be0d0ebe773a13dd839b42267c4336052f333
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>