Prevent recursive draw-invalidate cycle when drawing folder
am: 318f567a84

Change-Id: If30399d1acaff09239d9a7a6d0bf76891bf43144