Merge "Show a cursor on long press" into ics-mr0