Fix a crash when scrolling while a SMS is delayed.

Change-Id: I73f2d5f0e44dd80955db58e29ce1712cbf4e0ebb
Merge branch 'remote' into mkl