Merge "Fixing crash in previous CL." into ub-launcher3-burnaby