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

Change-Id: I1da61b4c377a6d337325451ea3b268c6fe491a86