Merge changes I81c76e8c,I4daac2b1

* changes:
  Initialize mAffineTransform and update on modification
  Allow persistence of input device calibration