Merge "Avoid crashes in a single app from causing cascading test failures"