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

Change-Id: I52dcf7b8debefe39a6a0f2ff8c6e04a0218e6332