fix merge issue
minor changes to be compatible with upstream changes
test coverage for StreamActivity