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