Tweaks for canvas

Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
5 files changed