Merge "Rounds up scaled width/height" into gingerbread