Reduce overdrawing

Fix some overdraw issues where the same background was
 being painted multiple times.

Change-Id: I11f5aadf5be75a92713d1ea4a1a1837d7ae91058