Merge "Ensure content-overlay is removed on app re-launch" into tm-dev