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

Change-Id: I934cccd1c0c79902938c5e3c3e9454cb0d45bfce