Merge "Add AppCompatDialogFragment" into mnc-dev