Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev am: 885ac76b90 am: d3e7cc010b
am: e88a886de3

* commit 'e88a886de313ff115575b2213b98c8adc5f2aab9':
  SF: Fix arbitrary rotation with inverse display transform

Change-Id: I89b0819b0970daa20352928677064d0c5d8e2cc1