Merge "Remove outdated display bounds calculation"