Merge "Reusing the same bitmap and pixel array for shape detection" into ub-launcher3-edmonton