[automerger skipped] Merge "Use windowFrames.frame instead of frame to draw the area." am: f9d35cf89e
am: 3bcb668c1a -s ours
am skip reason: change_id I072daae54601120de5b6eaa0a64ee7c3096e4a43 with SHA1 7138f343a1 is in history

Change-Id: Ic79ea427005cd10435c2d5fea719b6e23ce98cb0