Merge "Fix Password entry won't enable when lockout finished in screen-off" into qt-qpr1-dev
am: 407f2f37c8

Change-Id: If16c47f20066500e1ded6f96f64877c38bfdc5f7