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

* commit '2a994b343f6d92910c3c9fba2641aa04bf5eb1fd':
  Allow for more than one home app.