Merge "Use META_HOME_ALTERNATE for home app uninstall target" into klp-dev