Merge "Improving diagnostics for objects disappearing from screen" into sc-dev