am 4fabf1dd: Merge "Fixing crash in previous CL." into ub-launcher3-burnaby

* commit '4fabf1dd41a28135b40d4a33c78a080f86161e36':
  Fixing crash in previous CL.