Merge "Add null check when populating popup" into ub-launcher3-dorval
am: 7a0010d20e

Change-Id: Ia89cbcec58fbfbf509187538a51ffa68d3353467