[automerger skipped] Merge "Fix monkey crash in smart selection animation" into pi-dev am: 1ffdec20b4
am: 3b88884d91  -s ours

Change-Id: Idbdce925f874763d8d5bd990e4d0ec48ee481a00