Merge "Add null-check before reparenting content overlay" into tm-dev