Merge "Workaround shader crash" into mnc-dev