am 5f80ef2d: Merge "Resource cleanup: Removing obsolete resources" into ub-launcher3-burnaby

* commit '5f80ef2d019aa66d585cf14d92ef340534a453ed':
  Resource cleanup: Removing obsolete resources