Merge "Fix monkey crash in smart selection animation"