Merge "ui: Add constness to Draw- functions." am: 47b650b588
am: a9e8c76fef

Change-Id: I16aee9bb96c0d3e381edc2e063b365472a7e357a