Merge "Fix persisting flags for apps with data only Force gc's before deleting containers.:"