Merge "Modernize calls to drawImage" into sc-dev