Merge "winscope: fix incorrect bounds offset"