Merge "Adding per-app support for app add/remove"