Merge "Launcher restore state fixes:" into ub-launcher3-calgary-polish
am: add78abb98

Change-Id: Ib1b5e20228098cc4a09e4e547faf3c69e4119261