Merge "Fix possible FragmentManager NPE in Dialer" into klp-dev