Merge "Add argument checks in setScale and setCrop" into tm-dev