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