Merge "Fix drawing sequence from using deprecated Canvas APIs." into pi-dev