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