Merge "Add a missing case when detecting if a toast can be added" into nyc-mr1-dev am: fa198f42d3
am: 0fb32d5ed1

Change-Id: I4aac9b1c71ac0c873e455de44546eec5a8c46c3c