Merge change 6845 into donut

* changes:
  Use MeasureSpec.getWidth instead of default display in lock pattern widget.