Merge "Correct viewport initialization, bounds comparison"