Fill NPE during activity configuration update on setup.

[Review issue 9532001]