am 1b247d9f: Merge "Adding workaround for regression caused by ag/752175" into ub-launcher3-burnaby

* commit '1b247d9f37cd1e9ca9e8c690c137858b66314b79':
  Adding workaround for regression caused by ag/752175