Merge "Simplifyling widget inflation and addition flow." into ub-launcher3-master