Merge "Fix NPE in setSurfaceTexure" into mnc-dev