Merge "Fix bug where shape reveal progress gets started too early." into ub-launcher3-qt-dev am: 1dbec0ef43
am: 04b7fa18e7

Change-Id: Iaeccc7cc8c858468be295834d33f14e182f7db5a