Show loading indicator immediately in init as before (#11850)

f7ee755e cherry-picked from the master branch.

Merge: no

Change-Id: Ibe91db13b301aaf0a2b5e6e5fb08f566bf5cadab