Merge "Include visible window clients when dumping activities in bugreport" into main