Flush ContentState as an alternative to complete DataStore reset

Signed-off-by: Jody Garnett <jody.garnett@gmail.com>