Merge "Fix 5223982: Adding one pixel transparent border around the texture."