Merge "Fix disco bounce crash b/30413641" into ub-launcher3-calgary
am: 9407db1e11

Change-Id: I1f786330fd6635dc6a73e7503a4d38adfb108d03