Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev