Merge "Fix certificate manager UI (take 2)" into main

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:clipChildren="true">