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

Change-Id: I0394d14d8c34b8aea9dcb11e64b90ad972b420a0