Merge "Updating the display bounds when it changes" into sc-dev