Merge "Use boundsOnScreen to offset the translate"