Merge "Ensure calling package and UID synchronized while calling dump()"