Merge "Back out of Home settings when penultimate home app is uninstalled" into klp-dev