am 8d8c73b5: Merge "Code cleanup" into ub-launcher3-burnaby

* commit '8d8c73b591bf58f93f8841938ad8ce92085f7105':
  Code cleanup