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