Fix random UI loading failure

Change-Id: Ia7fc3a7f2b45fb1fd4648062ca06553f42132f61