Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev