Merge "Fixing issue with click shadow not being drawn correctly." into ub-launcher3-burnaby