Delay entrypoint update until visibly initialized.
am: cce414f8b4

Change-Id: I5d3e9d15ad152496ca6901e3c17b8fd4fb4a7ac2