Merge "Add missing translate if the drawable top is not 0,0" into nyc-dev