Merge \"Fixing bug in getDescendantCoordRelativeToParent where it was calculating the coordinates relative to the root\'s parent\" into ub-launcher3-calgary
am: b25b2c41c2

Change-Id: Ie2978044fe0f33ec8f8f6dcdd147750dec72950a