Merge "Preventing new object creation during animation frame" into ub-launcher3-edmonton