Merge "PiP: Take inset into consideration when calculating stash offset." into sc-dev