Merge "Clean up DarkUIInfoDialogFragment" into tm-dev