Draw UI fixes

bug:10705772
Change-Id: I529d178cdd4fc910b50a3f8c72187b1c61924743
28 files changed