Merge "Preserve window for Activity#recreate if possible"