Merge "Removing view layer support during state animation." into ub-launcher3-master