Merge "SF: Iterate correctly over multiple displays when computing and caching bounds"