Fix an overlay crash and two dead settings (pre-release audit, wave 2)#535

FuJacob merged 1 commit into

mainFuJacob/cotabby:mainfrom

fix/overlay-and-lifecycle-hardeningFuJacob/cotabby:fix/overlay-and-lifecycle-hardeningCopy head branch name to clipboard