Merge "Fix push shader to native"