BUG 14831: Fixed crash that could occur when log scaling is enabled

Change-Id: I8f29b1cee15ed2e1d6a220717853a7dcd4a6e1c0
Merge topic '14831_log_scaling_crash' into next

b7133cf7 BUG 14831: Fixed crash that could occur when log scaling is enabled