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

Change-Id: Ibe91db13b301aaf0a2b5e6e5fb08f566bf5cadab