Merge "Include VRI state when dumping activities in bugreport" into main