Merge "Roll forward "Show error dialog if activity is blocked from streaming""