Merge "Handle shader matrix correctly when ignoring canvas transform" into mnc-dev