Merge "Fix longpress crash." into jb-ub-now-kermit