Merge "Support multiple internal and external viewports"