Merge "Fix monkey crash in smart selection animation" into pi-dev
am: 1ffdec20b4

Change-Id: Idbc82d56568d65542d189c84954c3c3f7cd7aea9