Merge "SF: Fix camera orientation on virtual displays" into nyc-dev