Merge "Add null check when populating popup" into ub-launcher3-dorval