Merge "Add display of password expiration status"