Merge "Do not show blocking helper if user likes channel"