Merge "Fix for IOOB when suggestions have disappeared"