Merge "Mitigate 10 minutes delay in launcher restore for work apps." into ub-launcher3-rvc-dev am: 144f638fa3

Change-Id: Ifa3823efa131e6eba786a053e14a3e7a54182a90