This helps us track the unmount Upstream-commit: 0d7ab8db03814bac19fe076a0d53b6d423616bc7 Component: engine