Merge "Use FragmentActivity instead of AppCompatActivity" into tm-dev