Merge "Clean up the no-history entries while the app died" into sc-v2-dev