Merge "Fix logspam when user removed before CE storage prepared"