Merge "Winscope: keep backwards compatibility prior to windowFrames"