Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev