Merge "Preserve app window when it requests a relaunch" into oc-dev