Merge "Skip config check for destroyed activities"