Merge change 23289 into eclair

* changes:
  Fix http://b/issue?id=2086835 (unlock pattern graphics misaligned).