Merge "Only populate activity view when we're showing it"