Merge "[2/n] Introduce dynamic bounds calculation to prevent letterboxing" into main