Merge "Convert credential view to DialogFragment"