Merge "Make app-controlled animations more robust" into ub-launcher3-master