Merge "Picking a bitmap to reuse where least pixels are wasted" into ub-launcher3-burnaby