am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1

* commit '4d8ecc65c5a747f350492b21397d7466ff628900':
  Fix 5231823: PIN/Password polish on lock screen