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

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

Change-Id: Id2a9b2b48d11de2097ee29a000338e94f9d663d0