don't draw layers with history

The history picture and the layers drawn may be out of sync,
so for now, don't draw the layers when the history picture is
drawn.

Also, remove native class check from drawExtras() since it
is already checked by the caller.

fixes http://b/2457350
fixes http://b/2453780