Merge "Fixing crash when emptyView gets added twice" into ub-launcher3-rvc-dev am: 947905d28b

Change-Id: Iae90cf1244b7b36d06beff17d8a3972f4cf5240c