Merge "Add bugfix flag for view state reset to 0 papercut fix." into main