Merge "Update the PIP exclusion bounds when PIP is offset by shelf/ime" into sc-dev