Revert "Revert "Prevent visibility notification been called twice in object creation""
This reverts commit 4d277b96ad581358f63870ae051dc73b69c82cd7.
Woops, this wasn't meant to be committed. I just reverted it locally
to test something, nothing wrong with the original commit :)