Merge "Use windowFrames.frame instead of frame to draw the area."
am: f9d35cf89e

Change-Id: Id5619922102a0cf201339081f637a3c47c8222bf