Merge "Do not modify the children order while iterating the viewgroup" into ub-launcher3-master