Merge "Re-order draw methods to make update-api happy"