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

* commit '19e51855bd884981b01f5d6d0958d7e391c5d352':

Change-Id: I6ba362462d83f85b00fe8209b4f4e0e13b52c770