am d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0

* commit 'd7035c58b006b62084232c8db6c4f7c4002170cc':
  Fix a hang in SF caused by invalid transform matrix from the WM