am ed46c093: Merge "Refactoring common methods" into ub-launcher3-burnaby

* commit 'ed46c093cf1f34a2056846ac826b19fa2335ec18':
  Refactoring common methods