Merge "Fix 2571872: Showing an error message on wrong password/pin entered."