Merge "Fix crash on long press of prediction row icons"