[automerger skipped] Merge "Fix crash after smart selection animation" into pi-dev am: 6df95fa087
am: 3fa9bdb193  -s ours

Change-Id: I6d082254c3ff1dbd35f7531119e01eec33ce722e