Merge \"Fixing page indicator being drawn at wrong position\" into ub-launcher3-calgary
am: 879f3bcef5

Change-Id: Ifca0fea49a29c31b3202e5c0cb076772594a4e79