Merge "Fix StageCoordinator unexpected onDisplayAreaVanished"