Merge "Make ManagePermissionsFragment more TV-friendly." into mnc-dev