Merge "Change cropAndScaleBitmap logic" into tm-dev