Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev am: 885ac76b90 am: 19e51855bd
am: 0aab534460

* commit '0aab534460a198ec97d4711d5cf3ca4cdc9b68a0':

Change-Id: I438911abd2077b6189bcf2a7ef73ed66e74efbe0