Merge "Remove displayBounds when computing layer bounds" into sc-v2-dev