am 63976e53: am 2a994b34: Merge "Allow for more than one home app." into klp-dev

* commit '63976e5325b72b74e1c802da4bd5caa664ccef67':
  Allow for more than one home app.