Merge "Fix crash after smart selection animation" into pi-dev
am: 6df95fa087

Change-Id: Ie37f7c1809c71c6ffa44bc20090493d90b4a8c41