Merge "Fix non-zero window inset" into sc-dev