Merge "Test to ensure a toast doesn't affect app standby" into nyc-mr1-dev