fix first draw bug

bug:8579593
Change-Id: Ifb4727fcf23b0696db14427f00aa2a911b4a367b
18 files changed