Merge "Method to show DialogFragment allowing state loss." into mnc-dev