Merge "Adding more information to logs like content description to help with debugging." into main