Merge "Add correct content descriptions for favorite tab"