Merge "Disable and remove finger." into dalvik-dev