Merge "Revert "Remove scrim fade animation when returning to launcher."" into ub-launcher3-master