resolve merge conflicts of c10abb25f3 to cw-e-dev.
am: c3d14f58d8

* commit 'c3d14f58d80cc5ed8b60ee1782d38643c08734e7':
  Clean up package installer styling