Merge "Surface: replace active rect with window crop" into jb-dev