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

Change-Id: I8bd84c6bfc8f8e51f6ac67489c2e339b56430bba