Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev