Merge "Fix various crashes from a destroy-timeout activity"