Merge "Avoid updating display orientation from closing activity" into main