Merge "Use screen bounds instead of stable bounds in initial bounds calculation" into main