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

Change-Id: I5d7b6cb01c1e3a92ab4297ddecce04869d2e9996