Merge "Allow for more than one home app." into klp-dev