Merge "Do not start home activity if it's not ready" into oc-dev
am: 4865137df8

Change-Id: Ia3bf46f438f3b017a51a58658e849947d69c4d65