Merge "Test to ensure a toast doesn't affect app standby" into nyc-mr1-dev am: a3798a3fb3
am: 5c8f866953

Change-Id: Ic3839a3c2ec5bd99b6e1eab9f112becef29b9765