Merge "Fix crashes in UserDetailViewAdapterTest." into rvc-dev