Merge "Remove duplicate call to update PIP bounds on PIP expand" into sc-dev