am 3ebbc50c: am 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev am: b343db76 * commit 'b343db76':