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

* commit '55b29f2ec5d62a13eb374501ebc4691eadd3997a':
  SF: Fix camera orientation on virtual displays

Change-Id: I9993f7ffd7e34ea6fb81edb8006ea3d635ae1eb4