Merge "Fix 5533861: Correct the thumbnail area hit testing calculation." into ics-mr1