Merge "resolve invalid size variable issue for people view" into ub-launcher3-master