Merge "Replace containing aspect ratio hard comparison with rounded one" into tm-qpr-dev